Merge commit 'upstream/0.2.0'
authorAsias He <asias.hejun@gmail.com>
Sat, 19 Mar 2011 01:55:28 +0000 (09:55 +0800)
committerAsias He <asias.hejun@gmail.com>
Sat, 19 Mar 2011 01:55:28 +0000 (09:55 +0800)
commitc76817f31fc0748d47e3999e22857d52143c153b
treed163e6c8ee92339463bb26978b982ced99ec2f93
parente84050c558a7037a9686d44696e92292189ddc90
parent1b425d93a10616cfa6301dc0239a37eb05cb073c
Merge commit 'upstream/0.2.0'